Revision: tla--wmipf--1.1--patch-8
Archive: mt@wmipf.in-berlin.de--devel-2003
Creator: Michael Teichgraeber <mt@wmipf.in-berlin.de>
Date: Thu Jul  3 04:39:06 CEST 2003
Standard-date: 2003-07-03 02:39:06 GMT
Summary: merge with lord
Keywords:
New-files: 
New-directories: 
Removed-files: 
Removed-directories: 
Renamed-files: 
Renamed-directories: 
Modified-files: ./ChangeLog ./libarch/cmd-add-log.c
    ./libarch/cmd-add-pristine.c
    ./libarch/cmd-archive-fixup.c
    ./libarch/cmd-archive-setup.c ./libarch/cmd-buildcfg.c
    ./libarch/cmd-merges.c
    ./libarch/cmd-my-default-archive.c
    ./libarch/cmd-new-merges.c ./libarch/cmd-revisions.c
    ./libarch/cmd-star-merge.c ./libarch/cmd-versions.c
    ./libarch/star-merge.c ./libarch/star-merge.h
    ./libarch/tag.c ./tutorial/elementary-branches.doc
    ./tutorial/exploring-changesets.doc
Modified-directories: 
New-patches: giles@nemeton.com.au--2003-GPL/tla--giles--1.1--base-0
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-1
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-2
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-3
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-4
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-5
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-6
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-7
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-8
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-9
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-10
    jblack@merconline.com--2003/tla--devo--1.1--base-0
    jblack@merconline.com--2003/tla--devo--1.1--patch-1
    jblack@merconline.com--2003/tla--devo--1.1--patch-2
    jblack@merconline.com--2003/tla--devo--1.1--patch-3
    lord@emf.net--2003b/tla--devo--1.1--patch-63
    lord@emf.net--2003b/tla--devo--1.1--patch-64
    lord@emf.net--2003b/tla--devo--1.1--patch-65
    lord@emf.net--2003b/tla--devo--1.1--patch-66
    lord@emf.net--2003b/tla--devo--1.1--patch-67
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-8
Removed-patches: 

merge with lord

Patches applied:

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-55

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-1
   update to tla--devo--1.1--patch-62

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-2
   fix typo in archive-setup help

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-3
   typo fix in add-pristine --help

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-4
   remove duplicate 'the' in tla my-default-archive -H output

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-5
   fix spelling of 'ordinarily'

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-6
   remove unwanted apostrophe in archive-fixup -H

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-7
   typo fix in add-log -H

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-8
   typo fix in tla merges -H

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-9
   fix typo in new-merges -H

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-10
   add whitespace to buildcfg -H

 * jblack@merconline.com--2003/tla--devo--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-62

 * jblack@merconline.com--2003/tla--devo--1.1--patch-1
   Changed the names of the innocent

 * jblack@merconline.com--2003/tla--devo--1.1--patch-2
   Updated documents to explain how to show a changeset in --diffs format

 * jblack@merconline.com--2003/tla--devo--1.1--patch-3
   Fixed the cached revision documents

 * lord@emf.net--2003b/tla--devo--1.1--patch-63
   added missing include of hackerlab/os/time.h

 * lord@emf.net--2003b/tla--devo--1.1--patch-64
   merge doc improvements from jblack

 * lord@emf.net--2003b/tla--devo--1.1--patch-65
   merge pristine-search improvements to star-merge from mt@wmipf

 * lord@emf.net--2003b/tla--devo--1.1--patch-66
   tweak pristine search in star-merge

 * lord@emf.net--2003b/tla--devo--1.1--patch-67
   merge in help message fixes from giles

